From b2415fc9fce78f473017cc002f1f848bdbe71bd5 Mon Sep 17 00:00:00 2001
From: Anders Wegge Jakobsen <wegge@users.mediawiki.org>
Date: Sat, 29 Apr 2006 07:31:26 +0000
Subject: [PATCH] Use the returnto parameter on successfull login

---
 RELEASE-NOTES                 | 1 +
 includes/SpecialUserlogin.php | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c0cd88d2db..6497f62a66 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -137,6 +137,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5751) Updates to Portuguese localisation files
 * (bug 5741) Introduce {{NUMBEROFUSERS}} magic word
 * (bug 93) <nowiki> tags and tildes in templates
+* The returnto parameter is now actually used by SpecialUserlogin.php
 
 == Compatibility ==
 
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 3c98c7aa65..d6112c828c 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -421,7 +421,11 @@ class LoginForm {
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 		$wgOut->addWikiText( $msg );
-		$wgOut->returnToMain( $auto );
+		if ( !empty( $this->mReturnto ) ) {
+			$wgOut->returnToMain( $auto, $this->mReturnTo );
+		} else {
+			$wgOut->returnToMain( $auto );
+		}
 	}
 
 	/** */
-- 
2.20.1